summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-09-15 05:03:19 +0200
committerCharles Lombardo <clombardo169@gmail.com>2023-09-15 05:08:06 +0200
commit7e2bd395bc1ffe986a3965dc2872e4c87e63ce58 (patch)
tree031755fdf615bf00e4a559140dec7860f7a060a0
parentMerge pull request #11505 from t895/config-patch (diff)
downloadyuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.gz
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.bz2
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.lz
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.xz
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.zst
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.zip
-rw-r--r--src/android/app/src/main/jni/native.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 8ac28b638..8a2021ff0 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -327,12 +327,13 @@ public:
m_system.ShutdownMainProcess();
m_detached_tasks.WaitForAllTasks();
m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
+ m_window.reset();
+ OnEmulationStopped(Core::SystemResultStatus::Success);
+ return;
}
// Tear down the render window.
m_window.reset();
-
- OnEmulationStopped(m_load_result);
}
void PauseEmulation() {